Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Sat, 13 Feb 2010 12:30:17 +0000 (13:30 +0100)
committerJan D. <jan.h.d@swipnet.se>
Sat, 13 Feb 2010 12:30:17 +0000 (13:30 +0100)

Trivial merge